t / t4135 / diff-with quote.diffon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1--- "postimage".txt.orig        2010-08-18 20:13:31.744002255 -0500
   2+++ "postimage".txt     2010-08-18 20:13:31.744002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage